Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test suggestion PR #400

Closed
wants to merge 1 commit into from
Closed

Test suggestion PR #400

wants to merge 1 commit into from

Conversation

trungleduc
Copy link
Member

No description provided.

Copy link
Contributor

github-actions bot commented Nov 8, 2024

Binder 👈 Launch a Binder on branch jupyterlab/jupyter-collaboration/suggestions

@trungleduc
Copy link
Member Author

trungleduc commented Nov 8, 2024

Hmm, there is no conflict but the diff is still showing the code existing on main. It would be annoying for reviewers

@davidbrochart
Copy link
Collaborator

Yes I was expecting something like that.

@trungleduc
Copy link
Member Author

If we keep using backport PRs but do the rebase when we decide to merge suggession to main, it should be ok?

@davidbrochart
Copy link
Collaborator

Could you try to rebase locally, and see how it goes?

@trungleduc
Copy link
Member Author

Could you try to rebase locally, and see how it goes?

it's the same as rebase without the backport PR

@trungleduc
Copy link
Member Author

but I agree It's cleaner by rebasing regularly the suggestions branch

@davidbrochart
Copy link
Collaborator

but I agree It's cleaner by rebasing regularly the suggestions branch

I would prefer doing that, maybe we can allow it on the suggestions branch, or we do it on our forks?

@trungleduc
Copy link
Member Author

but I agree It's cleaner by rebasing regularly the suggestions branch

I would prefer doing that, maybe we can allow it on the suggestions branch, or we do it on our forks?

Is the forced-push protection rule applied only to the main branch? If that's the case let's do it directly on the suggestions branch.
If you can give the commit right here I can also help doing the rebase.

* Add forking API

* Add GET forks of root

* Add fork Jupyter events

* Replace query parameter merge=1 with merge=true

* Add fork title and description
@davidbrochart
Copy link
Collaborator

I just rebased suggestions on main, so the force-push protection rule doesn't apply to suggestions.
Let me see if I can give you rights on this repo.

@davidbrochart
Copy link
Collaborator

I gave you maintainer rights, if it's not enough I'll give you admin rights.

@trungleduc
Copy link
Member Author

Great! Thanks

@trungleduc trungleduc closed this Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants